Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 10 May 2010 07:13:43 +0000 (07:13 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 10 May 2010 07:13:43 +0000 (07:13 +0000)

Trivial merge